Add proposed patch to fix test failures when run on tmpfs

Closes: #975418

diff --git a/debian/changelog b/debian/changelog
index b80e1d75029bb0771592e71d7dd24a060e16835e..9bfaed78050a96673ce7e98a413624f4fea176c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ostree (2020.8-2) UNRELEASED; urgency=medium
+
+  * d/p/test-pull-summary-sigs-Set-timestamps-to-serve-expected-f.patch:
+    Add proposed patch to fix test failures when run on tmpfs
+    (Closes: #975418)
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 22 Nov 2020 13:21:08 +0000
+
 ostree (2020.8-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/series b/debian/patches/series
index b73e566a722cdb595a2da78c1c1ef5f43703efb2..0070b994764f39eb9cf2f7320de18e3cc5a39cd5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+test-pull-summary-sigs-Set-timestamps-to-serve-expected-f.patch
 debian/Skip-test-pull-repeated-during-CI.patch

diff --git a/debian/patches/test-pull-summary-sigs-Set-timestamps-to-serve-expected-f.patch b/debian/patches/test-pull-summary-sigs-Set-timestamps-to-serve-expected-f.patch
new file mode 100644 (file)
index 0000000..28e2f45
--- /dev/null
+++ b/debian/patches/test-pull-summary-sigs-Set-timestamps-to-serve-expected-f.patch
@@ -0,0 +1,100 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Sun, 22 Nov 2020 13:17:24 +0000
+Subject: test-pull-summary-sigs: Set timestamps to serve expected files
+
+If this is not done, the test can fail when the temporary directory is
+a tmpfs: for example this happens during build-time testing with /var/tmp
+on tmpfs or TEST_TMPDIR pointing to a tmpfs, or installed-tests with
+gnome-desktop-testing-runner allocating the test directory on a tmpfs.
+
+In particular, many of Debian's official autobuilders now do the entire
+build and test procedure in a chroot hosted on a tmpfs, to improve build
+performance and prevent fsync overhead.
+
+In this situation, it appears that overwriting summary.sig with a copy
+of summary.sig.2 is not sufficient for the web server to tell the
+libostree client that it needs to be re-downloaded. I'm not completely
+sure why, because tmpfs does appear to have sub-second-resolution
+timestamps, but forcing a distinct mtime is certainly enough to
+resolve it.
+
+Resolves: https://github.com/ostreedev/ostree/issues/2245
+Bug-Debian: https://bugs.debian.org/975418
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Forwarded: https://github.com/ostreedev/ostree/pull/2246
+---
+ tests/test-pull-summary-sigs.sh | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/tests/test-pull-summary-sigs.sh b/tests/test-pull-summary-sigs.sh
+index 401e88c..3819cbf 100755
+--- a/tests/test-pull-summary-sigs.sh
++++ b/tests/test-pull-summary-sigs.sh
+@@ -175,6 +175,8 @@ cd ${test_tmpdir}
+ # Reset to the old valid summary and pull to cache it
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ repo_reinit
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+@@ -186,6 +188,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
+ # summary signature since it was generated on the server between the
+ # requests
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ if ${OSTREE} --repo=repo pull origin main 2>err.txt; then
+     assert_not_reached "Successful pull with old summary"
+ fi
+@@ -197,6 +200,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
+ 
+ # Publish correct summary and check that subsequent pull succeeds
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+ assert_has_file repo/tmp/cache/summaries/origin.sig
+@@ -208,6 +212,8 @@ echo "ok pull with signed summary remote old summary"
+ # Reset to the old valid summary and pull to cache it
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ repo_reinit
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+@@ -220,6 +226,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
+ # is caching the old signature. This should succeed because the cached
+ # old summary is used.
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+ assert_has_file repo/tmp/cache/summaries/origin.sig
+@@ -228,6 +235,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
+ 
+ # Publish correct signature and check that subsequent pull succeeds
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+ assert_has_file repo/tmp/cache/summaries/origin.sig
+@@ -239,6 +247,8 @@ echo "ok pull with signed summary remote old summary signature"
+ # Reset to the old valid summary and pull to cache it
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
++touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ repo_reinit
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+@@ -273,6 +283,8 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
+ # Publish new signature and check that subsequent pull succeeds
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
+ cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
++touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
+ ${OSTREE} --repo=repo pull origin main
+ assert_has_file repo/tmp/cache/summaries/origin
+ assert_has_file repo/tmp/cache/summaries/origin.sig